Merge from origin/emacs-25

aae436e Uncomment the next-error-function integration in xref
5f0d096 Remove the word "valid", to avoid ambiguity

diff --cc doc/emacs/maintaining.texi
Simple merge